From e3d25b3c3cc8ae5b2dee5c25ce689a3e67760991 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 8 Apr 2014 21:15:06 +0200 Subject: [PATCH] entry: Don't show text handles too eagerly on button press Instead do so on button release, or after text selection dragging starts. --- gtk/gtkentry.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 764e952c88..4f97458e4a 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -4254,6 +4254,9 @@ gtk_entry_button_press (GtkWidget *widget, is_touchscreen = test_touchscreen || gdk_device_get_source (source) == GDK_SOURCE_TOUCHSCREEN; + if (is_touchscreen) + gtk_entry_ensure_text_handles (entry); + priv->select_words = FALSE; priv->select_lines = FALSE; @@ -4333,12 +4336,8 @@ gtk_entry_button_press (GtkWidget *widget, else { gtk_editable_set_position (editable, tmp_pos); - if (is_touchscreen) - { - gtk_entry_ensure_text_handles (entry); - gtk_entry_update_handles (entry, GTK_TEXT_HANDLE_MODE_CURSOR); - } + gtk_entry_update_handles (entry, GTK_TEXT_HANDLE_MODE_NONE); } break; @@ -4450,6 +4449,7 @@ gtk_entry_button_release (GtkWidget *widget, } else if (is_touchscreen) { + gtk_entry_update_handles (entry, GTK_TEXT_HANDLE_MODE_CURSOR); gtk_entry_selection_bubble_popup_set (entry); if (priv->magnifier_popover) gtk_widget_hide (priv->magnifier_popover); -- 2.30.2